Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 22 Sep 2011 23:00:51 +0000 (16:00 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 22 Sep 2011 23:00:51 +0000 (16:00 -0700)
commitf2abb34ef3fced7401d786f349313456aa3ae255
tree13ff8f663fe74dcf553675dcee0f25f5b89d2a0f
parentbff2e60c2a708d5122d31f5e6b81104f144bc730
parentc5a5e7f2b8689b70468d301c6b20070fd4af3ddf
Merge from trunk.